From 41992839cd7ebc35f7106017e9685df890a3326a Mon Sep 17 00:00:00 2001 From: "Yixun Lan (dlan)" Date: Fri, 21 Mar 2014 06:44:16 +0800 Subject: [PATCH] tools: fix --enable-xenapi typo error typo in tools/configure.ac cause --enable-xenapi does not works lead to variables XML2_CONFIG, CURL_CONFIG not set Signed-off-by: Yixun Lan (dlan) Acked-by: Ian Campbell --- tools/configure | 2 +- tools/configure.ac | 2 +- tools/libxen/Makefile | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/configure b/tools/configure index e974c5dd20..5c2fa142bf 100755 --- a/tools/configure +++ b/tools/configure @@ -4702,7 +4702,7 @@ if test x"${PERL}" = x"no" then as_fn_error $? "Unable to find perl, please install perl" "$LINENO" 5 fi -if test "x$xapi" = "xy"; then : +if test "x$xenapi" = "xy"; then : # Extract the first word of "curl-config", so it can be a program name with args. set dummy curl-config; ac_word=$2 diff --git a/tools/configure.ac b/tools/configure.ac index 884d63d666..a62faf8057 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -151,7 +151,7 @@ AC_PROG_INSTALL AC_PATH_PROG([BISON], [bison]) AC_PATH_PROG([FLEX], [flex]) AX_PATH_PROG_OR_FAIL([PERL], [perl]) -AS_IF([test "x$xapi" = "xy"], [ +AS_IF([test "x$xenapi" = "xy"], [ AX_PATH_PROG_OR_FAIL([CURL], [curl-config]) AX_PATH_PROG_OR_FAIL([XML], [xml2-config]) ]) diff --git a/tools/libxen/Makefile b/tools/libxen/Makefile index b66f0bc679..262412dfe4 100644 --- a/tools/libxen/Makefile +++ b/tools/libxen/Makefile @@ -22,12 +22,15 @@ MAJOR = 1.0 MINOR = 0 CFLAGS += -Iinclude \ - $(shell $(XML2_CONFIG) --cflags) \ - $(shell $(CURL_CONFIG) --cflags) \ -fPIC +ifeq ($(LIBXENAPI_BINDINGS),y) +CFLAGS += $(shell $(XML2_CONFIG) --cflags) \ + $(shell $(CURL_CONFIG) --cflags) + LDFLAGS += $(shell $(XML2_CONFIG) --libs) \ $(shell $(CURL_CONFIG) --libs) +endif LIBXENAPI_HDRS = $(wildcard include/xen/api/*.h) include/xen/api/xen_all.h LIBXENAPI_OBJS = $(patsubst %.c, %.o, $(wildcard src/*.c)) -- 2.30.2